Partial refund for products #12164

irfano · 2024-07-29T16:58:59Z

Closes: https://github.com/woocommerce/woomobile-private/issues/285
Closes: #11707

Description

This PR adds partial refund support for products. Before, the user could only select the products' quantity, and the amount was calculated as a full refund.

Warning

wordpress-mobile/WordPress-FluxC-Android#3069 must be merged before this.

Now, we are shooting a custom amount dialog when the product refund text is tapped. This dialog was already implemented with #1633 but removed later.

before	after	after-dialog

Steps to reproduce

Open the Orders tab.
Tap + button to create a new order.
Add products, custom amount and shipping and create an order.
Navigate back.
Tap the order item you just created.
Tap the "Issue refund" button.
Make a partial refund.

Testing information

Please test different order types that include products, custom amounts, and shipping. Test full and partial refund.

Only products
Products and custom amount
Products and shipping
Products, shipping and custom amount

Images/gif

I have considered if this change warrants release notes and have added them to RELEASE-NOTES.txt if necessary. Use the "[Internal]" label for non-user-facing changes.

wpmobilebot · 2024-07-29T17:06:19Z

📲 You can test the changes from this Pull Request in WooCommerce-Wear Android by scanning the QR code below to install the corresponding build.

	App Name	WooCommerce-Wear Android
	Platform	⌚️ Wear OS
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`541fa01`
	Direct Download	`woocommerce-wear-prototype-build-pr12164-541fa01.apk`

dangermattic · 2024-07-29T17:10:20Z

	1 Error
🚫	This PR is tagged with `status: do not merge` label(s).

	1 Warning
⚠️	This PR is assigned to the milestone 19.8. This milestone is due in less than 2 days. Please make sure to get it merged by then or assign it to a milestone with a later deadline.

Generated by 🚫 Danger

wpmobilebot · 2024-07-29T17:46:23Z

Found 1 violations:

The PR caused the following dependency changes:

expand

-+--- org.wordpress:fluxc:trunk-cc6b2f85546a844b13d99bc0ad6ceabd1af131d3
-|    +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.25
-|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)
-|    |    \--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.9.25
-|    |         \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)
-|    +--- androidx.appcompat:appcompat:1.0.2 -> 1.6.1 (*)
-|    +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.2 (*)
-|    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6
-|    |    \--- androidx.annotation:annotation:1.2.0 -> 1.7.0 (*)
-|    +--- androidx.security:security-crypto:1.0.0 -> 1.1.0-alpha03
-|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.0 (*)
-|    |    +--- com.google.crypto.tink:tink-android:1.5.0
-|    |    \--- androidx.collection:collection:1.1.0 -> 1.4.0 (*)
-|    +--- com.squareup.okhttp3:okhttp-urlconnection:4.9.0
-|    |    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.12.0 (*)
-|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10 -> 1.9.10 (*)
-|    +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
-|    +--- org.apache.commons:commons-text:1.10.0 (*)
-|    +--- androidx.room:room-runtime:2.6.1 (*)
-|    +--- androidx.room:room-ktx:2.6.1
-|    |    +--- androidx.room:room-common:2.6.1 (*)
-|    |    +--- androidx.room:room-runtime:2.6.1 (*)
-|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.25 (*)
-|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1 -> 1.8.1 (*)
-|    |    +--- androidx.room:room-common:2.6.1 (c)
-|    |    \--- androidx.room:room-runtime:2.6.1 (c)
-|    +--- com.google.dagger:dagger:2.51.1
-|    |    \--- javax.inject:javax.inject:1
-|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 (*)
-|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 (*)
-|    +--- org.wordpress:wellsql:2.0.0
-|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.7.0 (*)
-|    |    \--- org.wordpress.wellsql:wellsql-annotations:2.0.0
-|    +--- org.wordpress.fluxc:fluxc-annotations:trunk-cc6b2f85546a844b13d99bc0ad6ceabd1af131d3
-|    +--- org.greenrobot:eventbus:3.3.1 (*)
-|    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.12.0 (*)
-|    +--- com.android.volley:volley:1.1.1 -> 1.2.0
-|    +--- androidx.paging:paging-runtime:2.1.2
-|    |    +--- androidx.paging:paging-common:2.1.2
-|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.7.0 (*)
-|    |    |    \--- androidx.arch.core:core-common:2.0.0 -> 2.2.0 (*)
-|    |    +--- androidx.arch.core:core-runtime:2.0.0 -> 2.2.0 (*)
-|    |    +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.6.2 (*)
-|    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.6.2 (*)
-|    |    \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.2 (*)
-|    +--- com.goterl:lazysodium-android:5.0.2
-|    +--- net.java.dev.jna:jna:5.5.0
-|    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)
++--- org.wordpress:fluxc:3069-7afd7e6be72dd202b98897527c5878d7c1a4aeff
+|    +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.25
+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)
+|    |    \--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.9.25
+|    |         \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)
+|    +--- androidx.appcompat:appcompat:1.0.2 -> 1.6.1 (*)
+|    +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.2 (*)
+|    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6
+|    |    \--- androidx.annotation:annotation:1.2.0 -> 1.7.0 (*)
+|    +--- androidx.security:security-crypto:1.0.0 -> 1.1.0-alpha03
+|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.0 (*)
+|    |    +--- com.google.crypto.tink:tink-android:1.5.0
+|    |    \--- androidx.collection:collection:1.1.0 -> 1.4.0 (*)
+|    +--- com.squareup.okhttp3:okhttp-urlconnection:4.9.0
+|    |    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.12.0 (*)
+|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10 -> 1.9.10 (*)
+|    +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
+|    +--- org.apache.commons:commons-text:1.10.0 (*)
+|    +--- androidx.room:room-runtime:2.6.1 (*)
+|    +--- androidx.room:room-ktx:2.6.1
+|    |    +--- androidx.room:room-common:2.6.1 (*)
+|    |    +--- androidx.room:room-runtime:2.6.1 (*)
+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.25 (*)
+|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1 -> 1.8.1 (*)
+|    |    +--- androidx.room:room-common:2.6.1 (c)
+|    |    \--- androidx.room:room-runtime:2.6.1 (c)
+|    +--- com.google.dagger:dagger:2.51.1
+|    |    \--- javax.inject:javax.inject:1
+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 (*)
+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 (*)
+|    +--- org.wordpress:wellsql:2.0.0
+|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.7.0 (*)
+|    |    \--- org.wordpress.wellsql:wellsql-annotations:2.0.0
+|    +--- org.wordpress.fluxc:fluxc-annotations:3069-7afd7e6be72dd202b98897527c5878d7c1a4aeff
+|    +--- org.greenrobot:eventbus:3.3.1 (*)
+|    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.12.0 (*)
+|    +--- com.android.volley:volley:1.1.1 -> 1.2.0
+|    +--- androidx.paging:paging-runtime:2.1.2
+|    |    +--- androidx.paging:paging-common:2.1.2
+|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.7.0 (*)
+|    |    |    \--- androidx.arch.core:core-common:2.0.0 -> 2.2.0 (*)
+|    |    +--- androidx.arch.core:core-runtime:2.0.0 -> 2.2.0 (*)
+|    |    +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.6.2 (*)
+|    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.6.2 (*)
+|    |    \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.2 (*)
+|    +--- com.goterl:lazysodium-android:5.0.2
+|    +--- net.java.dev.jna:jna:5.5.0
+|    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)
-\--- org.wordpress.fluxc.plugins:woocommerce:trunk-cc6b2f85546a844b13d99bc0ad6ceabd1af131d3
-     +--- org.wordpress:fluxc:trunk-cc6b2f85546a844b13d99bc0ad6ceabd1af131d3 (*)
-     +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
-     +--- com.google.dagger:dagger:2.51.1 (*)
-     +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 (*)
-     +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 (*)
-     +--- androidx.room:room-runtime:2.6.1 (*)
-     +--- org.wordpress:wellsql:2.0.0 (*)
-     +--- org.wordpress.fluxc:fluxc-annotations:trunk-cc6b2f85546a844b13d99bc0ad6ceabd1af131d3
-     +--- androidx.room:room-ktx:2.6.1 (*)
-     \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)
+\--- org.wordpress.fluxc.plugins:woocommerce:3069-7afd7e6be72dd202b98897527c5878d7c1a4aeff
+     +--- org.wordpress:fluxc:3069-7afd7e6be72dd202b98897527c5878d7c1a4aeff (*)
+     +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
+     +--- com.google.dagger:dagger:2.51.1 (*)
+     +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 (*)
+     +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 (*)
+     +--- androidx.room:room-runtime:2.6.1 (*)
+     +--- org.wordpress:wellsql:2.0.0 (*)
+     +--- org.wordpress.fluxc:fluxc-annotations:3069-7afd7e6be72dd202b98897527c5878d7c1a4aeff
+     +--- androidx.room:room-ktx:2.6.1 (*)
+     \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)

Please review and act accordingly

wpmobilebot · 2024-07-29T18:03:07Z

📲 You can test the changes from this Pull Request in WooCommerce Android by scanning the QR code below to install the corresponding build.

	App Name	WooCommerce Android
	Platform	📱 Mobile
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`541fa01`
	Direct Download	`woocommerce-prototype-build-pr12164-541fa01.apk`

irfano · 2024-07-29T18:16:20Z

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/refunds/IssueRefundViewModel.kt

@@ -867,6 +891,8 @@ class IssueRefundViewModel @Inject constructor(
        return availableFeeLines
    }

+    private fun calculateProductTotal(order: Order) = order.items.sumByBigDecimal { it.subtotal + it.totalTax }


Please review this logic to ensure nothing is missed here.

Removed the `textAlignment` property as it was unnecessary.

irfano · 2024-07-31T16:05:21Z

@JorgeMucientes, I found an issue with this implementation. After selecting all products and manually changing the products refund amount, from 126 to 100, the subtotal and taxes still display 126. I think it would be better to make the subtotal and taxes fields editable instead of products refund field, similar to how it is done on the web. WDYT?

If you agree, I can update this PR.

JorgeMucientes · 2024-07-31T16:59:32Z

I think it would be better to make the subtotal and taxes fields editable instead of products refund field, similar to how it is done on the web. WDYT?

Good catch, @irfano. Yeah, I think that makes sense, and enabling it allows for more flexibility when editing the values.

irfano added 3 commits July 29, 2024 18:45

Make refund products total text a button

8b89756

Open the custom amount dialog when the product refund amount is tapped

63342bb

Send amount data to refund endpoint

fb9c68a

irfano added type: enhancement A request for an enhancement. status: do not merge Dependent on another PR, ready for review but not ready for merge. feature: refunds Related to order refunds. labels Jul 29, 2024

irfano added this to the 19.8 milestone Jul 29, 2024

irfano requested a review from JorgeMucientes July 29, 2024 16:58

irfano mentioned this pull request Jul 29, 2024

Update RefundRestClient to support partial refunds wordpress-mobile/WordPress-FluxC-Android#3069

Draft

irfano added 4 commits July 29, 2024 21:12

Calculate the refund amount for products only and use it

42b1d7f

Update IssueRefundViewModelTest

f143652

Update RELEASE-NOTES.txt

802c31e

Update fluxCVersion to PR

c43c6a6

irfano force-pushed the feature/partial-product-refund branch from 4474d7b to c43c6a6 Compare July 29, 2024 18:13

irfano commented Jul 29, 2024

View reviewed changes

Optimize refund_by_items_products.xml

541fa01

Removed the `textAlignment` property as it was unnecessary.

irfano removed the request for review from JorgeMucientes July 31, 2024 16:35

irfano added the needs: feedback Needs a response from any of the parties involved in the issue. label Jul 31, 2024

irfano removed the needs: feedback Needs a response from any of the parties involved in the issue. label Jul 31, 2024

irfano marked this pull request as draft July 31, 2024 17:00

irfano removed this from the 19.8 milestone Aug 2, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Partial refund for products #12164

Partial refund for products #12164

irfano commented Jul 29, 2024 •

edited by JorgeMucientes

Loading

wpmobilebot commented Jul 29, 2024 •

edited

Loading

dangermattic commented Jul 29, 2024 •

edited

Loading

wpmobilebot commented Jul 29, 2024

wpmobilebot commented Jul 29, 2024 •

edited

Loading

irfano Jul 29, 2024

irfano commented Jul 31, 2024

JorgeMucientes commented Jul 31, 2024

Partial refund for products #12164

Are you sure you want to change the base?

Partial refund for products #12164

Conversation

irfano commented Jul 29, 2024 • edited by JorgeMucientes Loading

Description

Steps to reproduce

Testing information

Images/gif

wpmobilebot commented Jul 29, 2024 • edited Loading

dangermattic commented Jul 29, 2024 • edited Loading

wpmobilebot commented Jul 29, 2024

The PR caused the following dependency changes:

wpmobilebot commented Jul 29, 2024 • edited Loading

irfano Jul 29, 2024

Choose a reason for hiding this comment

irfano commented Jul 31, 2024

JorgeMucientes commented Jul 31, 2024

irfano commented Jul 29, 2024 •

edited by JorgeMucientes

Loading

wpmobilebot commented Jul 29, 2024 •

edited

Loading

dangermattic commented Jul 29, 2024 •

edited

Loading

wpmobilebot commented Jul 29, 2024 •

edited

Loading